Addresses @jairideout 's comments