adding missing OB1, OB2 support