last commit before changing core data model