reorganize eventData and add editing