A macro for death save advantage and crit range

I have a reborn with the hollow one supernatural blessing, I was wondering if there was an easy way of setting it up so that a roll of 16+ would show as a crit roll? So modifying the death saves crit range to be 16. I found an old macro that works for the advantage but is there a way I can sneak in the crit range somewhere as well? @{Salichar|wtype}&{template:simple} {{rname=^{death-save-u}}} {{mod=@{Salichar|death_save_bonus}}} {{r1=[[@{Salichar|d20}+@{Salichar|death_save_bonus}[MOD]@{Salichar|globalsavingthrowbonus}]]}} {{always=1}} {{r2=[[@{Salichar|d20}+@{Salichar|death_save_bonus}[MOD]@{Salichar|globalsavingthrowbonus}]]}} {{global=@{Salichar|global_save_mod}}} @{Salichar|charname_output}

@{Salichar|wtype}&{template:simple} {{rname=^{death-save-u}}} {{mod=@{Salichar|death_save_bonus}}} {{r1=[[@{Salichar|d20} cs>16  +@{Salichar|death_save_bonus}[MOD]@{Salichar|globalsavingthrowbonus}]]}} {{always=1}} {{r2=[[@{Salichar|d20} cs>16  +@{Salichar|death_save_bonus}[MOD]@{Salichar|globalsavingthrowbonus}]]}} {{global=@{Salichar|global_save_mod}}} @{Salichar|charname_output} Should work for you. 

This is great, previously this macro respected my sheet choice of Public/GM, but it's no longer doing that for some reason? Is there a way I can force it to be GM whisper, we always roll to GM on death saves. Figured it out on my own! By adding a /w GM to the start it rolls to GM!

Gauss missed the first @, @{name|wtype} attribute on that sheet loads the value set by the GM whisper toggle. So just add the @ to the start, and it should work fine.

Thanks guys! This has been super helpfull!

Oops, bad copy/paste on my part. Sorry. :)