made some changes to the models