changing before new data model