modified some files for OC to work