Safer track (13/22)

Safer track