Redo of Nov21 with files