example and some fix added