updated w/ David's comments