Tweaking logic grouping