Changed the camera architecture