add tweaking for sync