More changes to the model