OCInCAP made into seperate module