I'm following a recipe with a 17lb grain bill as well as 7lbs of extract. It's a quick mash, only 20 minutes @ 150, then I'm supposed to add 7 lbs of amber/dark extract, then boil as usual for 90 minutes. Silly question, but I'm calc'ng my mash volume based on the 17lbs of grain, not the 24lbs of total ingredients, right?