Re-build and updated code for "camera" fix