Rearranged parameter orders for more inuitive usage