Updates to 4.0.6