updated for JCROM 2.0.1