refactoring, first release candidate