updates from morning review
merge conflicts
merge conflicts