Update to encounter diagnosis

For example task force discussion on 10/23