Tweaked order of operations