Started to detect taps and added adjustable timings