commenting out function that is defined twice
adding states to exceptions list to fix bugs with filtering certain states