Intermediate changes still needed