Editing now works ok