Revert "Added distance tracking"

This reverts commit 5be9d8c75ab9dbd7b5d37cfe184e81c95947adea.
Revert "Revert "Added distance tracking""

This reverts commit 0e0e2d8fe598b754b600a7782d7e8ffc5bfd3a22.