Removed Track.order
Removed Context ref
Updated code