Update for 6.1