Made new async approach
Made it look pretty