More rearranging to prevent panic