Changed format for eventes in tracker function
Changed format of trigger for trigger function