Changes for 0.010