Public safety, back on track