Changed Dialog Handling