Completed solution for e2.10