Merge  Jay's Mbpoll Code