More work on confirmation messages