Rearranged input parameter order, easier to write code with