some edits which I intend to overwrite
Made manual merges