First draw of solution
revert
Revert "revert"

This reverts commit 22599bb1ee337d154ffe9195ea5a81ec0665ed93.