Additional changes done by John.