Merging Leland's and Tehilah's packages.