Re add Distance handler