Updates for 6_2