changed to polling