Improvement of safety measures