refactor to better use internal method, and to allow more relaxed (normal) operations
refactor to better use internal method, and to allow more relaxed (normal) operations

ooici/coi-services,ooici/coi-services,ooici/coi-services,ooici/coi-services,ooici/coi-services