final commit before activerecord refactoring