add XC and better message dialogues