many changes, but incomplete job