Adding some changes that fell out during Jon's revert
Merge branch 'chance'