Rearranged Inputs

Things make more sense now.