Updated for cam calibration - should be working...?