Bunch more work harmonizing the old with the new.