Update to sync

not finish yet