Addressing comments from @normanmaurer