Yes, in real soon, we should include the QBT yield farming, Fees on PBSS, Fees on Multiplexer.

In the update next week (or months), if the Mound team provides more info/clarification, I will add more assumptions to the calculation.

But, for this week, I think it's more safe to not too optimistic in calculation :)