FIX: controllerSingleton
UPGRADE: esp-* paks