changed to MVC