fixes to upgrade.
fixed merge
testing orders
fixed merge