Re-ordered setup to match what is done in the VC notes.