Voluntary Tax Contributions

Anyone know how to make voluntary tax contributions here in Thailand (this will get you a tax id number), I know that if you have a Non B visa and stay longer than 180 days in a calendar year you are obliged to pay the minimum tax required by law (16,000 baht a year I think)…..years ago on a NON B you had to submit a tax paper at the airport, or you could not leave.

(used to cost 900-1200 baht, this was paid to the accountant who gave the certificate of tax paid ..not at the airport )

I am thinking possibly something similar may be re-introduced so I’m trying to get some head start ….and history of contributions…if you get my drift

Thanks