Making edit work better.