> Please find updated patch below. Thanks for the feedback!

Ugh. Missed a commit when squashing. Here is the final patch: