Update for 6.8