Added track info
Removed unused NS