MVC approach tweaked