changing code for new model changes