Update for 3.05