change to MVC#2