Some more crazy changes