integrating changes to original COPS