Small Controller Change