Tweaked order of things a bit.