Added OIK and NJB