This is a much improved track