more MVC changes