Safer track (14/22)

Safer track