improved leap tracking