Safer track (22/22)

Safer track