Updated in response to Sam H's comments