merging C2PAP stuff