1 fix, 2 new solutions
Revert "1 fix, 2 new solutions"

This reverts commit 483c03afb884d25ee49f0b880da2fb0f00bd581e.
Revert "Revert "1 fix, 2 new solutions""

This reverts commit 602c1e3ed581f8d4aab3f36dce575de9a4bcf5fe.
new solution