Re-ordered things a little bit