Adding even tracking for real