Safer track (12/22)

Safer track