added a safety mode