#104 updated class and dialog.