Changes to helpers and controllers