Trying to get branches synced up

Changes to the surplus-new file