Updated to MVC