Fixed tracker and now tracks