Both, plus above mentioned terrain. I also don't think time alone necessarily increases speed and/or distance. improvement comes once you start pushing yourself physically to go faster for longer distances. Once you start improving you can cut the time down to get the same benefit or continue to ride longer times to get more miles in faster, either way it's a win for me physically and mentally.