Added more syncing