some edits to fix sync