adapted to the new tracking