Change Example according to Johan remarks