rearrange and upate sample

move