Changed the groups for verification and controls