improvement to group management and others