Working version, switching to thumb recalibration