changes for 6_2