Restructure fees and align incentives

Hi guys,

I am trying to wrap my head around about the new fee model and I would like to ask which number from https://stats.finance/yearn should I use for my calculations. In particular, i am modelling the treasury balances from which YFI holders will make half of the 20% performance fee and 2% management fee.
1.Vault is the only yearn’s product which should go into the performance and management fee calculation right?
2.Should i just use the “vaults” $ amount and do not include delegated vaults?
3.The 2% management fee is charged on the total amount in the treasury (not incl. profits) or total amount in treasury + profit?