Merging Ezra's additions