0.3 Streamlined the controller code