use newer tap system