Redid changes for f(h,s), now we only have one inputchoice pair again.