Changed the way in which cameras are handled