-Changed to use MVC