Updated to 3.07