Added a switch for event vs time tracker