a few changes, still no poll