Fixing Trackign code