editing changes from my recollection