Made some changes to Edit  which may conflict with other branches.