Added better dialog box