updates as per comments

updates as per comments

A24Group/Triage#5145