CHANGED the upgrade order, since the system started hanging