updated CI and controller