added and finished midterm2