Avoidance IR, almost done