finish sync rework