Adapted to new camera
Testing