Added changes for 0.04