changed a way to catch taps