1. Added group control