Improved Distance

Now is much more accurate