Performance improvement for track