Changed the upgrade system structure a little bit