Completed solution for e2.22