remove the input list, use the conditionals
Merge pull request #236 from impaler/dev

remove the input list, use the conditionals