slightly modify groups

Change-Id: I94cf4e98263b59e662a96f1f2c9e21b65fecf38d