MVC-60 refactored.