Improve the examples