ouch.
Let me get this straight, they originally had 25A, C and D, for two adults, one of which was the father, one was a nanny, and two children, one of which was a lap child? And you and the anonymous but gratious person in 25F moved to 25A/B. Right?
(don't get me started on this lap child crap......)