Rearranged some parameters