started porting pc2
fixed merge