Change design in examples.
Fix conflicts.