updates for morning Dec. 20
merge conflicts