Some changes to models (Not working well!!!(