changed update to accommodate safety mode