modified event tracking to be more generic and changed spotlight event data