changes in the model and controllers