- improved save of tracking functionality