In-between, fixing train tracker.