upgrades; some changes