Added methods for train tracking
Merge origin/master