Changes for 0.04