added LocationTracker
fix