Revert "Marc's Code"

This reverts commit 494651c27cca8c19de54234677909f8b66f58a06.