Changes for Edit script