Fixed up auto-sync design