more data, added discount rate