Added all sorts of tracking