Modify BOP support for the hundreth time