NPV calculation is now much faster