changed model and controller