Added initial track selection