Added double tap support