Noting here that we do this differently than in the rest of the samples. @ms-tg I am assuming you think this is a better way of doing this? If so, I want to think a bit about it and make sure we are consistent with the other samples