Updated PC Camera
Merge issues
Merge issues