Update for 3.0