Unyielding Sentinel Knights Challenge and Throw the boom should be separate abilities that share a cooldown if possible. As a tank I should be able to choose if I want to throw the single target shield throw or the AOE shield throw. This would allow me to take the upgrade without effectively losing an ability. As such in a raid such as Vision of Destruction or Lord of Blades I can choose to pull off say one of the dogs or explicitly the Lord of Blades without getting other mobs in the area which I do not want to pull aggro of. I absolutely love this shield throw ability and am grateful for it I would just love to have this flexibility if possible.