(inelegant, some refactoring is overdue...)