more dynamic

- fixed polling