PMM: Update to add Plus checks
SGF: Changes and additions to replacements