Make it asynchronous