small mods before adding group helper