Safer track (20/22)

Safer track