a lot of editing changes