Changed to use new track urls