Update for 3.99