syncing before refactor