Further work on the upgrade system