changes before september lab talk
trying to fix merge conflict