Changes for 0.042