separate ocs client from core procedures
bug fix