Updated for 6.1.x and 6.2.x