Make work safe