architecture was changed to MVC