Changes for 0.040003