Reorganised downloading and parsing.