Improved tracking

I'm not sure whether it's helped..