Address @yallop comments