Final commit before active record