more polling, some idiom merging