Improved calibration, shortcut to youtube demo