Rearranged input params to be optional.