new controller fixes