new controller, fixes