fixed an async issue
changed everything