New and improved poll()