Updates to group limits logic