Modified controller and helper