Help tweaking a macro

Trying to edit macros has reminded me why I changed my major from computer science 20 years ago. I apologize in advance for this question! I'm trying to do something that I thought would be fairly simple but I can't seem to get the syntax right. I found this macro the other day (Thank you to whomever wrote it...I've been so many places on this forum I can't remember where I grabbed it now.) &{template:simple} {{rname=Ability Check}} {{mod=[[ ?{Choose Attribute|Strength, @{selected|strength_mod} | Dexterity, @{selected|dexterity_mod} | Constitution, @{selected|constitution_mod} | Intelligence, @{selected|intelligence_mod} | Wisdom, @{selected|wisdom_mod} | Charisma, @{selected|charisma_mod} } ]]}} {{?{Roll|normal|advantage|disadvantage}=1}} {{r1=[[ @{selected|d20} + ?{Choose Attribute} ]]}} {{r2=[[ @{selected|d20} + ?{Choose Attribute} ]]}} {{charname=@{selected|character_name}}} It's basically perfect for what I want, with one change... I want the rname to display "Strength Check", or "Dexterity Check," etc rather than "Ability Check."  The way it's written, though, the query calls spit out a mod value instead of the name of the check so I can't use it in rname. Is there an easy way around it? Or maybe nest this macro inside another one? I really like the functionality of querying for normal/advantage/disadvantage. 

As a player I would far rather click a single button and have it roll two "to hit" rolls and a damage roll.&nbsp; It has been etiquette for some time on roll20 to use the left most number unless you have advantage or disadvantage.&nbsp; I realize that's my opinion, but it does eliminate a need for a query or clickable abilities on character sheets.&nbsp; Is the ability check you're looking for for the 5e OGL character sheet?&nbsp; If so, here is a recent post regarding&nbsp; the same thing: <a href="https://app.roll20.net/forum/post/8343713/pc-abilities-token-bar-and-slash-or-macro-bar/?pageforid=8368229#post-8368229" rel="nofollow">https://app.roll20.net/forum/post/8343713/pc-abilities-token-bar-and-slash-or-macro-bar/?pageforid=8368229#post-8368229</a>

That actually works really, really well. But is there a way to toggle advantage / disadvantage without switching over to my character sheet? Ultimately what I'm trying to do is handle as much as possible with macro buttons. Or is there a quick alteration I can make to one of those to query for advantage / disadvantage?&nbsp; EDIT: I have belatedly discovered the "query for advantage" button in the Character sheet. Now all of these macros other people have worked hard on work exactly like I want them to. Thanks for pointing me to that thread!