final major editing changes