Update for 3.06

Update for 3.06