Hi, I have a possible source for a M21 X 1 tap and die, would you like me to take a look tomorrow..? NA Tools America offer us superb deliveries on specials - on average 4-5 days from order receipt.