Yeah, I've just found out that the later style switchs came in some IB's. Ordered one and then managed to find the suitable plug on an old focus loom in the garage.