Changes for 6.8