updated safety model