Moved safety stuff to separate row