pre refactoring commit