synced the example with the upstream demo