Ib reform

No API breaking change