model updated for new database structure
404 fixed