Rearranging some keys