updated track generation
Merge origin/master