dialog edition + small changes