new controller code on May 26th