Update for 0.32