More changes but ran into partial problems