Made the input param order more consistent.