Safer track (7/22)

Safer track