Updated some groupy stuff