a lot of changes on edit
a lot of changes on edit.2