updated from in class review