revert group to helper func