Added simple safety flag