Make download simpler after review with Alex