latest changes from original COPS