changing to MVC