updated with what we did in class