changes in model and controller