another commit, less refactoring