Added addChange calls, improve Stone upgrades