Beg to differ but I've the opposite experience in the USA. There are many more rooms for non-smokers in my experience. I think that more and more smokers are getting short shrift, with *fewer* upgrade opportunities, but that is only my impression, I really don't know for sure.