Added more tracking stuff