Safer track (15/22)

Safer track