Staged changes

These changes seemed to have gotten lost when Jimm merged in this branch.