Massive improvement of the examples