new branch
fake camera button, fixed merge conflict