XML update [ch2 up to Franks room + template for the rest]