PO-FQ Smoking/Non-Smoking Rooms

[Laura's Dad]

We are contmeplating a WDW trip in May. We have stayed at PO-FQ before and loved the resort. We have always requested non-smoking rooms. My question is: If I were to be more specific in my room request and request a certain building, which buildings are smoking optional and which are completely non-smoking? I read somewhere that 2, 4, and the top floor of 6 were smoking optional. Is this correct? Has anything changed since the recent rnovations? Thanks in advance for any information.