Updates to clean up the grouping rule and other stuff