Did some modifications to the mock tracker.