CLAST: major refactoring