better sync handling