Updated tracker code