Update for 6.82