added fire and electric safety