Update to 3.07