Rework a bit the examples