Integrating AutoCamera - Fix 1