large refactoring step after colloquium