[P3]Safety switch changes.