[UPDATE] modifi and add code