minor edit for also considering 'Q'