more work on edit / create event