pre christine refactoring commit