More work on create event