redo application controller for refactoring