Safer track (10/22)

Safer track