Updates to will 0.3.9