Z: graph fix, goal number is now reflected