addpic3 and camera
fixed conflict