Revert "problem 2 solved"

This reverts commit fea879c608e4f92daac45eff3b9fbdc30bfeec40.
Revert "problem 1 solved"

This reverts commit fa1f36091b845f1067447dcffca631f0d2fa4383.