Some changes by Leah from Dan's laptop.