Completed solution for e2.37