fix, + new controller