second refactor plus dialog messages added