Added new tracker code