Safer track (5/22)

Safer track