worked on events and map helpers