Added changes for 01 launch