mary's 2nd feature (this is from bill's pull request)