General fucking up
Changed references