Added better syncing of data