Added changes to use camera