Addressing the comments from @sritchie