Update for 6_2