Improvements to Camera