changed to tap events for accel
resolved merge errors from tap handler