Change #1 by Bill
Change #2 by Bill