Added more to the controller