Safer track (18/22)

Safer track