Sync with brunch demo