More work on downloading