Revert "New Code"

This reverts commit eadad5000a30d9f87631935a81aca29d86125475.
Revert "Revert "New Code""

This reverts commit 2bbcf5942e19cf80f95b40f39f8582bbd1ca0685.