added initial group support