Rework with some example started