Platform safety enhancement

shape