Update for 6.0