Improved Holger import to be able to handle my files.