add Bill's recent changes