updated from in class exercises