changes as of 42714 working on poll stuff