Rearranged some order to be consistent