Big improvement on the model