Update Code and Fix Async Problem