updates to msg and polling