First revision of dialog class finished