Added  track
code cleanup
Merge branch 'add-new-track'