Added info + now avoids warning at each polling