Adding changes from last week.