Further work on edit