More group-manager related work.