new mockups, database-model changed