Turning it into async