adapted to new controller return value