Completed solution for e2.38