some changes on edit