updated with notify message parser