moved 2 async tasks to separate files