More changes, still with errors