Rearranging some bits in the server