Re-arranged things a tad.