add the camera
Merge branch 'test'
patch conflicts