NOISSUE code rearrange