last commit before data model revamp