Updates per tech review  - work in progress safety commit.