Made partional tracking more efficient.