Update for 3.07

Update for 3.07