improve group mode