Incorporating comments from @r-gaia-cs