Re: XS - rebase on F-11, notes and RHF