Further work on Edit