hopefully made tracking more robust