Updated tracker script