Refactored View.controller
Backup