Incorporated Dillon's changes.