modified examples for the new client.
Merge updates