Changed groups to form groups and simplified usage