"You" Is Who?

In Jeremiah 51:20-26 it's a little confusing who is being talked about when. It seems to have even affected The Daily Bible's editor, at least if the commentaries I checked are right. They say that Babylon is being referred to in verses 20-23 where God discusses his "war club" which shatters nations, not Israel as indicated in The Daily Bible's section header. In verse 24, then, where God says, "Before your eyes I will repay Babylon," the "your" here is Judah. In verse 25, then, the prophecy resumes against Babylon.