changed model to MVC