modified to return controller straight away