Added async block for smooth performance