added upgrading based upon 5.x/6.x