Move this inside the model change