Dialog update

Next up: commute logic change