Fix stefans work