Update for 3.1