MVC-77 refactored.