Improved upgrade to 3.x information