MVC-10 refactored.