Address comments from @bobsilverberg