better sync + bug fixed