Improve @edit command