More work to make the files very nice