fixed models, NEED TO MIGRATE DATABASE and UPDATE IT