Reworked WACC some more