rearranged the inputs (for usability)