Added returns to controller.php