updates Nov 30
merge conflicts