partial support, added new controller