Safety flag

Extra safety with the safety flag