Updated NPV and IRR