Addresses further @jairideout 's comments