added basic tracking of events