latest changes.. messageSet added handler changed