Done Refactoring

Using Join and Async task :D