editing changes, almost done