look into better tap