Even better edit state; now without crashing!