Safer track (21/22)

Safer track