change some parameters order