Dialog rework