refactored download service, v2.3.5