Changing to MVC model