refactored track method
refactored track method