add bundle-tap macro and use it