remove the input list, use the conditionals

#185  use the conditionals