added in full npv calculation