Changes for camera

Warning these does not work correctly.