No longer checking collision with surrogates as deltas are now the same for all tracks
Added bailout when delta tends to zero