updated files in response to Adam's review comments