New input format
Applying MVC.