poll better, added extensions