fixed to pull all states