Incorporate Bill's changes