track creation refactored.
track creation refactored.