Re-org to make things a little clearer