Updates per David comments