upgrades, part III (should be done now)