updates morning of May 31
merge conflicts