What tank do you have on the 16i? a 40 litre or 48 litre (early or late) if its the 48 litre its the same as a S1.... carparts express do them (may be temporarily out of stock , but more comming) if you have the early tank, you will be very very lucky to find one, my advice would be to fit the later tank, but you have to make some mods to the fuel pump area.