added time of repayment, fixed year calculation