tweaking to allow correct syncing