Simon - please please accept my changes...