changed all tap events to clicks