merging latest updates from original COPS