2.3.7, clean up, new group