Improved safety measures