Updated to latest bidi