some changes in edit