adapt to the new touch & calibration frame work