Implemented tap feature