some more crazy changes