Updated time handling for downloading