More changes to model