Retirement tax questions

Yes Yes Yes.  Your suggestion works.  But I must say to TurboTax -- You have got to do a better job in dealing with this question.  I suspect that quite a few people gave back all or a portion of their RMD after the CARES act passed.  I spent way too much time in dealing with this issue!