Safety upgrade