Rework and better examples