Update for 1.6