Organized upgrade plan, added general upgrades.