Safer track (9/22)

Safer track