Adding public health and safety