some change in track creation logic