[Reviewer: Andy] Add diags and prompt for Ralf