Upgrade camera (18/29)

Upgrade camera