modified JCROM.java and OCM.java