other logic to get polling routing ok
new version