Problem 31
Problem 35
Problem 44
Revert "Problem 31"

This reverts commit 86a95e3002d4445d329414f90ffddf8e854f4d73.
Problem 31