Simplified the controller