Last minute adjustments from Jo