Refactored out slow tap functionality