structure improvement
finished tracker structure