update for proper group handling