Added createGroup code back in