Updated tracking setup a bit