some changes to the model