more work on new CFC/OMS integration