(#95) - implement longpoll changes