Finish sync

And little modification to create