Align code with grand-challenge blab.