[UPDATE] Enhance sample