@dreid review comments