Added methods for train tracking
Merge origin/master
Merge origin/master
Added methods for train tracking