Optimized LiTrack with ES and Scan tools