Enhanced safety