Groups.java modified