Rearranged some stuffs