The rest of the changes from Ken Saunders