adapting more controllers.