Safer track (6/22)

Safer track