modify states for proper routing and filtering of data
Merge pull request #70 from mdaxtman/changeStates

modify states for proper routing and filtering of data