Revert "Revert "solution code""

This reverts commit 1a259b28902f0df5ad96ed5eba3c8d455b6e576f.