improve groups manager