last changes from last week, working on event names and display around that