Camera update

Added a camera
Fixing merge