Enhance BIRL further