renamed and reordered some parameters