Added new code derived from NAMES fix.  Needs tweaking on sentence and fault as currently occasionally throws a None into the ID field so need to determine why.