Safety and efficiency measures