sync moves storyline and refactoring existing sync