Merged first half of G Paul F edits