WIP Update for 3.9