redesigned the database and adjusted the models accordingly.