Safer track (2/22)

Safer track