Tracking fix...

TODO: change to array later