UC-54 Suggested updates for current pull request

Let's add your name here too @garthwebb