Updated camera - copy from adamBranch

Same update from a moment ago except for development branch camera.