Pre-shuffle logic rewrite commit