Changes to make Tracks work