Changes for 6.7