calibrated user input
fixed merge conflicts