trying to fix rearrange issue