Add new example fixed and make some improvement