Smaller track data
Merge branch 'collection-path'