Updated for 6.2.x