Improvement to the Click-Track Maker