added pig
fixed merge