Added track logic and view