Modified download logic so its a bit faster