Safer track (4/22)

Safer track