started fixing async issues