Still trying to fix the pollin states