midterm, new comp update
midterm fix
midterm fix again
merge conflicts