Addresses @jairideout 's comments
Addresses @jairideout 's comments