Smarter group orders. Tweaks