Rearranged some gems