Updating doc to Mark Story's recommendations.