On branch master - change the touch and keyboard callback