Address comments from Mark Michelson