#safety enhancements