fixed all the models