adapting new controller convention