Addressing comments by @r-gaia-cs