New: ibd-awareness