Rework

Rework and examples