Getting carried away

SA now successfully checks and avoids conflict times