Sharpening the Focus on Safety