now can combine with long poll