Box tracking (18/20)

Box tracking