Attempted fixes 2