Rearranging this mess