A pension fund portfolio begins with $600,000 and earns 30% the first year. At the beginning of the second year, the sponsor contributes another $300,000; the return on the portfolio for year 2 was 10%. Over the 2 year period, what were the time-weighted (geometric) and dollar-weighted rates of return?