Safer track (3/22)

Safer track