Made some changes to model