Reverted changes to create event and rearranged