Improve and finishes the examples