fixed current issue, now working on pathtracking