Improving location tracker