Rearrange for safety