Update with suggestion from Eric.