redone with better sync