improve polling