OP-22: integrating with OpenChat