Allow tracking (7/20)

Allow tracking