bit of a re-org