More work on `light_mgr`