Reverts last commit, implements user in group count.