adaptions to new controller system