+ Change two downloads methods