messages updated and improved