Safer track (17/22)

Safer track