fixed asynchronicity
fixed merge conflicts