Feature/ajw fix up download

This has been tested on a live upload and no issues were observed - everything ran smoothly