Tag - improved safety measures