merge latest updates to original COPS