Minor edits, not tested
Minor changes, not tested