Final bit of tracking added