camera complete, modifying create item
camera complete
updating merge conflicts