Bill's changes