@Diego -- thank you for your comment. I worry that an emphasis on energy will result in a bias towards "energy" solutions. I further worry that a "quantification" of social and economic uses of water will result in a different bias due to mis-calibration. My comment ("leave water to take care of itself") is based on local management of water among competing uses based on local notions of sustainability and social-economic value that can neither be modeled or observed at the national, aggregated or Bank level. I agree that the Bank can help client countries, but why not work on the ground up issue of local (watershed) water balance?