Moved download setup to -u option