New version from Kelvin
changed file endings and new files for 13.2